Sync main with language-reference-stable
#18718
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[Cherry-picked 5cc4a9c]
[Cherry-picked 57a6de2]
[Cherry-picked 8562128]
[Cherry-picked 22e6ffe]
[Cherry-picked 909b56c]
[Cherry-picked 58256dd]
[Cherry-picked 92152f4]
[Cherry-picked 0fa1c91]
Co-authored-by: Jamie Thompson <[email protected]> [Cherry-picked 724340e]
reorder the source versions [Cherry-picked 232180f]
also fixes the bullet-point under 3.3 to actually be a bullet point [Cherry-picked 38265fc]
[Cherry-picked 28d207d]
In the reference, in Erased Definitions, link pointed to the Inline page, even though the content is in Compile Time Operations [Cherry-picked c54bf67]
[Cherry-picked 390f836]
[Cherry-picked 1451dc5]
[Cherry-picked 9cae4e8]
[Cherry-picked bf10893]
[Cherry-picked 5d6891f]
[Cherry-picked 340303f]
[Cherry-picked 24cd50d]
Also fix typos in older changelogs [Cherry-picked 9b4ea8e]
[Cherry-picked 3eb354b]
bishabosha
approved these changes
Oct 18, 2023
WojciechMazur
added a commit
that referenced
this pull request
Jun 22, 2024
Backports #18718 to the LTS branch. PR submitted by the release tooling. [skip ci]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replaces #17614
This PR is semi-automatically generated to synchronize
language-reference-stablewithmain.It takes all commits from the first branch that are not present on the second and filters out all that were backported from
mainor have more than one parent. Then it examines changes introduced by each commit.Changes are divided into three groups:
changelogs,docs,scaladoc, andscaladoc-testcasesdirectories or any**.mdfile.projectdirecotryCommits only having safe changes were cherry-picked. Those having any potentially safe changes and those that contained both safe and unsafe changes were examined individually. Other commits were skipped.
Running a script and answering about each questionable commit took less than 10 minutes, and as a result, we have no conflicts. Working on #17614 would have required hours of fixing dozens of conflicts resulting from merging changes cherry-picked from the
mainbranch. It could also have led to subtle problems.If there is no problem with this approach, I'll modify the script slightly and make it a part of a CI instead of the current step that tries to merge the documentation branch to
mainafter every change.